From 179fc683551d2681144d20b1e60e0acaee194f7d Mon Sep 17 00:00:00 2001 From: nana-4 Date: Sun, 22 Nov 2020 12:24:04 +0900 Subject: [PATCH] Adwaita: Fix some sidebar sizing - Don't set the sidebar padding twice. - Add padding to the assistant sidebar directly, as it doesn't have .navigation-sidebar internally. - Set missing margin to the sidebar separator. See https://gitlab.gnome.org/GNOME/gtk/-/issues/3382 --- gtk/theme/Adwaita/_common.scss | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index af54488a80..d54d4dc81d 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -186,9 +186,9 @@ label { window.assistant { .sidebar { + padding: $menu-margin; background-color: $base_color; border-top: 1px solid $borders_color; - } &.csd .sidebar { border-top-style: none; } @@ -3540,7 +3540,6 @@ filechooserbutton:drop(active) { * Sidebar * ***********/ .sidebar { - padding: $menu-margin; border-style: none; background-color: mix($bg_color, $base_color, 50%); @@ -3595,6 +3594,10 @@ separator.sidebar { .navigation-sidebar { padding: $menu-margin 0; //only vertical padding. horizontal row size would clip + > separator { + margin: $menu-margin; + } + > row { min-height: 36px; padding: 0 8px; -- 2.30.2